Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cloth&radio hl2 #185

Closed
wants to merge 21 commits into from
Closed

Conversation

Elst28
Copy link

@Elst28 Elst28 commented Jun 21, 2023

О запросе слияния

Добавлены униформы HECU и гражданских из халф лайфа, также добавлено радио которое сравнится в техах и издаёт жуткие звуки (тоже из халф лайфа). Униформу хеку можно взять в охраншкафе, форму гражданского в одеждамате

Медиа

  • Я добавил скриншоты/видео к этому запросу слияния, демонстрирующие его изменения в игре, или этот запрос слияния не требует демонстрации в игре

Чейнджлог

🆑

  • add: Добавленны униформы HECU и гражданских из халф лайфа

@github-actions
Copy link

github-actions bot commented Jun 21, 2023

RSI Diff Bot; head commit d738ec3 merging into cf72d18
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Uniforms/Jumpsuit/civilian.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Clothing/Uniforms/Jumpsuit/hecu.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Objects/Fun/hl_radio.rsi

State Old New Status
icon Added

Edit: diff updated after d738ec3

@Elst28
Copy link
Author

Elst28 commented Jun 21, 2023

Так, вижу какая-то хуйня, сейчас буду разбираться

@@ -0,0 +1,3 @@
ent-UnityRadio = Uniny station radio
.desc = It plays the last signal from Unity station
.suffix = { "" }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

В конце всегда должна быть пустая строка

.suffix = { "" }
ent-ClothingUniformJumpsuitCitizen = комбинезон гражданского
.desc = Комбинезон, в котором ты точно будешь похожа на жертву.
.suffix = { "" }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

И тут

@@ -0,0 +1,3 @@
ent-UnityRadio = Радио станции "Единство"
.desc = Оно играет последний сигнал полученый со станции "Единство"
.suffix = { "" }
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

И тут

"directions": 4
}
]
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

И тут

"directions": 4
}
]
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

И тут

"name": "icon"
}
]
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

И тут

Copy link
Member

@AruMoon AruMoon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Укажи лицензию на unity fm. Что это и откуда

@github-actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Elst28 Elst28 force-pushed the Cloth&radioHL2 branch 2 times, most recently from d738ec3 to a2425cf Compare June 28, 2023 09:15
@Elst28
Copy link
Author

Elst28 commented Jun 28, 2023

Насколько я поняла, это саунд из халф лайфа 2 (Radio), его вообще можно пихнуть? И какую лицензию нужно указывать?

@Elst28
Copy link
Author

Elst28 commented Jun 28, 2023

Так, сейчас приведу всё в нормальный вид, ибо что-то возникла проблемка в гитхабом.

@github-actions
Copy link

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants